From f6c136d3fa3c7f19565c4a237b207ac36dae80f8 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 29 Dec 2004 14:46:12 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ) manual merge --- xen/arch/x86/traps.c | 1 + xen/common/kernel.c | 1 + 2 files changed, 2 insertions(+) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 64c6c8fe22..fed80f1f7e 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -51,6 +51,7 @@ #include #include #include +#include /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. diff --git a/xen/common/kernel.c b/xen/common/kernel.c index b0fbd6525a..e8053b274c 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -41,6 +41,7 @@ integer_param("xenheap_megabytes", opt_xenheap_megabytes); unsigned long xenheap_phys_end; xmem_cache_t *domain_struct_cachep; +xmem_cache_t *exec_domain_struct_cachep; struct domain *dom0; vm_assist_info_t vm_assist_info[MAX_VMASST_TYPE + 1]; -- 2.30.2